.
Regards,
Mahe
On Thursday, 13 July 2017 03:27:06 UTC+5:30, Igor Djordjevic wrote:
>
> On Wednesday, July 12, 2017 at 6:38:35 PM UTC+2, Yubin Ruan wrote:
>>
>> 2017-07-12 20:40 GMT+08:00 Maheshwaran A N <avpal...@gmail.com>:
>>
> > On Tuesday, 11 July 2017
I suppose you are trying to execute the below commands.
git checkout master
git merge origin/INT (taking changes from remote branch) or git merge INT
(merge with local changes)
At this point you would have faced the conflicts.
In this case, if you want to retain the changes of INT, you can
'deleted by us' means the file is deleted in the commit which you are
trying to do a cherry-pick. It is not file is deleted by you. Git tells
that the file was deleted in some other commit, and allows you to decide to
retain it (git add) or to remove it. You can do git cherry-pick --continue
Hi All,
How to list all the commits done in a specific branch. As you all know, git
log list the commits from all the branches (actual commits in that branch+
topic branches which got merged into).
Also, how to get the commits for a "particular file only in a specific
branch"
Thanks &
Hi All,
I am facing a serious problem in GIT Bash for some files. These files are
showing as 'modified' in git status, even it is not modified. I couldn't
track actually whats happening. This happens only in Windows platform. crlf
config is set as false. It dint help. For a newly cloned repo
