git commands

Pull data- git stash, git pull

created branch in Git-https://github.build.ge.com/OperationalExcellence/OEAutomation/tree/RegressionFixes-OWWAdvisor

folder local- C:\Users\ylondhe\Documents\Dunnes\OEAutomationGit

1.create branch, move to main branch, pull from it, move to new branch, add change and then commit

git clone url- "getting code from branch, url from UI"
git checkout -b branchname        -"new subbranch in branch"
git checkout branch name -"change branch"
git status -"check changes"
git add file name- "add file from local"
git commit -m "message" -"comiting code with message"
git push -"code push to branch"


steps to resolve the merge issue:
                                                1. git checkout branchaName
                                                2. git pull

                                                3. git checkout <ur branch name>
                                                4. git merge origin/branchname
                                                there will be merge issue
                                                which u need to resolve in local
                                                5. git add
                                                6. git commit
                                                commit once all files are done
                                                7. git commit
                                                8. git push