Some Tips to Reduce GIT Conflicts

 When  you  are working  on  same  project  with  many  co-workers  , I think those  small  steps  will  be  reduce pain  of  resolving  GIT conflicts .

1.  Re-base  every  day as  you  can   from  remote branch which you are wanted to merge ,your  local  branch .

2. If  any  thing standard git conflict  resolving ways  you  tried didn't  works , you may  use  this way. Create  a  backup  of  your  current  project  and then  create  a local new  branch  from  remote  branch  which  you  wanted  merge to  finally . Then  copy  paste  your  changes  from backup project  to  new  branch .  You  have to  make  sure  all  your  changes are  copying  to  new  branch .  After  that  please  make  do some  testing  to  check  all  changes  are there .  Then  push  your  changes to remote .  Finally  create  a pull  request . I  think  this  way  may not  be  much  professional  , but  this  also  can use as  your final  try.

Version  1.0.0