1. Go to the Develop branch and check out.
2. Pull the latest into Develop
3. Then check out the feature branch
4. Click on Git flow and select "Finish Feature"
5. In the "Finish Feature", uncheck the option that says "Delete Branch" after Finishing
6. A popup will show up if there are conflicts
7. Go to the Working copy which will list out all unstaged files
8. All conflict files has a yellow hazard icon associated with it.
9. Right click and open them up in the folder, look for HEAD
10. Correct the conflicts , stage the files and then commit the changes.
11. Then push the changes.
2. Pull the latest into Develop
3. Then check out the feature branch
4. Click on Git flow and select "Finish Feature"
5. In the "Finish Feature", uncheck the option that says "Delete Branch" after Finishing
6. A popup will show up if there are conflicts
7. Go to the Working copy which will list out all unstaged files
8. All conflict files has a yellow hazard icon associated with it.
9. Right click and open them up in the folder, look for HEAD
10. Correct the conflicts , stage the files and then commit the changes.
11. Then push the changes.
No comments:
Post a Comment