URL:
https://github.com/SSSD/sssd/pull/333
Title: #333: Move header files consumed by both server and client to special folder
fidencio commented:
"""
@amitkumar50, please, do not merge the branches. Just rebase your patches on top of git
master.
The workflow that I follow is:
- fork the SSSD's github repo
- clone the forked repo, as in your case would be: `git clone
git@github.com:amitkumar50/sssd.git`
- add the upstream repo as a remote: `git remote add ghsssd
https://github.com/SSSD/sssd`
- update the remote: `git remote update ghsssd`
- rebase my patches on top of the ghsssd/master: `git rebase ghsssd/master`
With that workflow, merge is not needed and our git history is way cleaner.
Please, try to do that and re-submit the patches. Feel free to ping me in case with have
issues with the described workflow.
"""
See the full comment at
https://github.com/SSSD/sssd/pull/333#issuecomment-318607764