Page History

1. Check out the code: git checkout TRAFODION-1507
2. Make the requested changes.
3. Run regression tests, if applicable.
4. Commit the changes with appropriate change information: git commit -a
5. Push the changes back to your private git fork: git push trafdeveloper_fork TRAFODION-1507

Resolve Merge Conflicts

Sometimes someone else's changes reach the target branch (e.g., master) before yours and has a merge conflict with your changes. Github will flag that situation in the status of your pull request. Before your changes can be merged, you must resolve conflicts in your pull request. This is the same process as above, making code changes, except that a merge command is done to create the changes.

Using the prior example:

1. Check out the code: git checkout TRAFODION-1507
2. git fetch origin
3. git merge origin/master
4. Resolve conflicts.
5. Run regression tests, if applicable.
6. Commit the changes with appropriate change information: git commit -a
7. Push the changes back to your private git fork: git push trafdeveloper_fork TRAFODION-1507

Change Merge