You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by "Francesco Chicchiriccò (Confluence)" <no...@apache.org> on 2020/11/25 08:30:00 UTC
[CONF] Apache Syncope > Git workflow

There's **1 new edit** on this page  
---  
|  
---  
|  | [![page icon](cid:page-
icon)](https://cwiki.apache.org/confluence/display/SYNCOPE/Git+workflow?src=mail&src.mail.product=confluence-
server&src.mail.timestamp=1606293000053&src.mail.notification=com.atlassian.confluence.plugins.confluence-
notifications-batch-plugin%3Abatching-
notification&src.mail.recipient=8aa980874e36a1eb014e36a2c41679b9&src.mail.action=view
"page icon")  
---  
[Git
workflow](https://cwiki.apache.org/confluence/display/SYNCOPE/Git+workflow?src=mail&src.mail.product=confluence-
server&src.mail.timestamp=1606293000053&src.mail.notification=com.atlassian.confluence.plugins.confluence-
notifications-batch-plugin%3Abatching-
notification&src.mail.recipient=8aa980874e36a1eb014e36a2c41679b9&src.mail.action=view
"Git workflow")  
|  |  |  |  | ![](cid:avatar_78b9d98d15f2e9b7250a2887bcf9b144) |  | Francesco
Chicchiriccò edited this page  
---  
|  
|  | Here's what changed:  
---  
|

...

|
![](https://cwiki.apache.org/confluence/s/963xr5/8501/fded9f91818631c3677be93247bf5ae6723a1c8d/_/plugins/servlet/confluence/placeholder/macro-
icon?name=code) Code Block  
---  
| language | bash  
---|---  
      
    
    git config core.autocrlf true  
  
##  Prepare your fork

...

##  Fork and clone

General introduction on this topic:
[https://guides.github.com/activities/forking/](https://guides.github.com/activities/forking/)

![](https://cwiki.apache.org/confluence/s/963xr5/8501/fded9f91818631c3677be93247bf5ae6723a1c8d/_/plugins/servlet/confluence/placeholder/macro-
icon?name=note) Note  
---  
| title | Not committer?  
---|---  
  
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](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`:

![](https://cwiki.apache.org/confluence/s/963xr5/8501/fded9f91818631c3677be93247bf5ae6723a1c8d/_/plugins/servlet/confluence/placeholder/macro-
icon?name=code) Code Block  
---  
| language | bash  
---|---  
      
    
    cd syncope
    git remote add syncope https://gitbox.apache.org/repos/asf/syncope.git  
  
or

![](https://cwiki.apache.org/confluence/s/963xr5/8501/fded9f91818631c3677be93247bf5ae6723a1c8d/_/plugins/servlet/confluence/placeholder/macro-
icon?name=code) Code Block  
---  
| language | bash  
---|---  
      
    
    cd syncope
    git remote add syncope https://github.com/apache/syncope.git  
  
or

![](https://cwiki.apache.org/confluence/s/963xr5/8501/fded9f91818631c3677be93247bf5ae6723a1c8d/_/plugins/servlet/confluence/placeholder/macro-
icon?name=code) Code Block  
---  
| language | bash  
---|---  
      
    
    cd syncope
    git remote add syncope git@github.com:apache/syncope.git  
  
...

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.

  
  
  
|  |  | [Go to page
history](https://cwiki.apache.org/confluence/pages/viewpreviousversions.action?pageId=63407850&src=mail&src.mail.product=confluence-
server&src.mail.timestamp=1606293000053&src.mail.notification=com.atlassian.confluence.plugins.confluence-
notifications-batch-plugin%3Abatching-
notification&src.mail.recipient=8aa980874e36a1eb014e36a2c41679b9 "Go to page
history")  
---  
---  
| [View
page](https://cwiki.apache.org/confluence/display/SYNCOPE/Git+workflow?src=mail&src.mail.product=confluence-
server&src.mail.timestamp=1606293000053&src.mail.notification=com.atlassian.confluence.plugins.confluence-
notifications-batch-plugin%3Abatching-
notification&src.mail.recipient=8aa980874e36a1eb014e36a2c41679b9&src.mail.action=view)  
---  
  
|  | [Stop watching
space](https://cwiki.apache.org/confluence/users/removespacenotification.action?spaceKey=SYNCOPE&src=mail&src.mail.product=confluence-
server&src.mail.timestamp=1606293000053&src.mail.notification=com.atlassian.confluence.plugins.confluence-
notifications-batch-plugin%3Abatching-
notification&src.mail.recipient=8aa980874e36a1eb014e36a2c41679b9&src.mail.action=stop-
watching&jwt=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ4c3JmOjhhYTk4MDg3NGUzNmExZWIwMTRlMzZhMmM0MTY3OWI5IiwicXNoIjoiZTlkNmRhOWExODQ0ODg4MjU2ZThmZjFlNzJiNmU2NjQ2ZjI5ZWMyMjRlNDc3ZDZmMWRlNmIwYTI0ZWFlOWQ4ZCIsImlzcyI6ImNvbmZsdWVuY2Vfbm90aWZpY2F0aW9uc0FSRUgtWFVEMS1QT1FHLUNTQU8iLCJleHAiOjE2MDY4OTc4MDAsImlhdCI6MTYwNjI5MzAwMH0.KAfgUH4juLwaemK-
MGFsAlkKdybkOWZsr9r0xYTjUkU) | •  
---|---  
[Manage
notifications](https://cwiki.apache.org/confluence/users/editmyemailsettings.action?src=mail&src.mail.product=confluence-
server&src.mail.timestamp=1606293000053&src.mail.notification=com.atlassian.confluence.plugins.confluence-
notifications-batch-plugin%3Abatching-
notification&src.mail.recipient=8aa980874e36a1eb014e36a2c41679b9&src.mail.action=manage)  
---  
| ![Confluence logo big](cid:footer-desktop-logo)  
---  
This message was sent by Atlassian Confluence 7.5.0  
![](cid:footer-mobile-logo)  
---