Update your (forked & locally cloned) repository's master branch with the golden repository's master (IMPORTANT: Your fork's master branch should not be touched with any of your development changes. It should just reflect the golden repository's master, exactly).
Error rendering macro 'excerpt-include' : No link could be created for 'Coding'.
Complete the development on your newly created branch.
Commit changes in the updated file to your branch with a good commit message. Make your commit message relevant and concise, so that it will be helpful to you later:
Push the development branch to your fork. By convention, 'origin' points to your forked repository on GitHub:
git push origin <JIRA ID>
Repeat the above steps until you are satisfied with your code change.
Fetch changes made to the golden repository by other contributors. By convention, 'upstream' points to the golden repository on GitHub:
git fetch upstream
Rebase your development branch with new changes from the golden repository's master. 'upstream/master' is the remote tracking branch for the golden repository's (upstream's) master branch, on your local machine:
git checkout <JIRA ID>
git rebase upstream/master
If there are conflicts, Git will throw an error message informing you so and ask you to resolve it before continuing the rebase.
Resolve conflicts the same way you resolve an ordinary merge conflict in Git. Here's a way to resolve conflicts from the command line.
Then, just continue the rebase operation:
git rebase --continue
If the conflict is complex or problematic, you can abort the current rebase operation instead of continuing, and come back to it later:
git rebase --abort
After the rebase is complete, you might want to clean up your branch's commit history:
Squash all your commits into fewer, meaningful change commits (just one suffices if the code change is small enough).