I need help in understanding git rebase for this situation. I checked out a branch created by some one 10 days back. I checked out using
git checkout -b <some name> origin/branchname
(I just used different name to identify it)
After checkout, if I do rebase by being in this checked out branch,
git rebase origin/master
It shows some errors like 1) Trailing whitespace - I read about this but even after trying this command that I found online, i still see the warnings.
git config core.whitespace nowarn
2) Auto-merging CONFLICT (add/add): Merge conflict in... these files are in master branch but the content is modified a little bit in the checkout branch. So how should I fix this? I don't have authority to change anything in master directly if that's the way to fix it. These files should have the content from this checkout branch so that the testing will work fine as it's related to that..please clarify me..
regards