| ...
![]() Code Block |
|
|
git config core.autocrlf true |
Prepare your fork ... Fork and clone General introduction on this topic: https://guides.github.com/activities/forking/
![]() Note |
|
|
| If you are not (yet?) committer, the first thing to do is to fork the syncope Git repository: so, visit https://github.com/apache/syncope and hit the Fork button. |
Once you have cloned the remote repository (syncope's in case you are committer, or your own fork), the next thing to do is to make sure you have the syncope Git repository configured as a remote.
In this case we will add it as a remote called syncope:
![]() Code Block |
|
|
cd syncope
git remote add syncope https://gitbox.apache.org/repos/asf/syncope.git |
or
![]() Code Block |
|
|
cd syncope
git remote add syncope https://github.com/apache/syncope.git |
or
... The key point is to avoid updating your feature branch with master until the PR is ready to be merged (or until you're asked to rebase). This way you'll avoid accidental merge commits and fixing conflicts when you shouldn't be dealing with that.
If for you want to keep your branch up to date with the latest master changes anyway, always rebase it; don't git pull or introduce merge commits, as it will complicate the rebasing process and will make it difficult to merge the pull request in a clean way.
|
