wonderful-dusk-20983
04/19/2021, 11:21 AMbr-1 and br-2.
br-1 is a branch to which other team members can also push code too
I was preparing to push changes from br-2 to br-1
To do so, I checked out to br-1, pulled in all the latest changes
merge the br-2 with br-1
meanwhile br-1 was changed by a team member.
I could confirm this because I could no longer push to br-1
While I try to pull changes from br-1, i get fatal: Not possible to fast-forward, aborting.
I want to push to br-1 in way that changes in the remote are not changed and I am not required to pull the br-1 again
Any suggestions?broad-camera-13514
04/20/2021, 8:28 AMcareful-pencil-58247
04/20/2021, 10:35 AMbroad-magazine-64835
04/21/2021, 9:34 AMfull-airline-32280
04/22/2021, 5:51 PMfreezing-rocket-8377
04/23/2021, 6:56 AMhundreds-winter-88791
04/23/2021, 8:37 AMcalm-grass-85557
04/23/2021, 10:34 AMwooden-horse-80000
04/23/2021, 12:09 PMmodern-table-48211
04/24/2021, 11:15 AMswift-microphone-91058
04/25/2021, 9:06 AMaverage-midnight-68816
04/26/2021, 4:57 AMbroad-camera-13514
04/26/2021, 1:15 PMwonderful-dusk-20983
04/27/2021, 12:46 AMbroad-camera-13514
04/27/2021, 8:25 AMhundreds-winter-88791
04/27/2021, 9:50 AMfaint-energy-11966
04/27/2021, 12:50 PMcalm-grass-85557
04/27/2021, 3:05 PMbroad-camera-13514
04/27/2021, 4:27 PMmillions-ice-83302
04/28/2021, 2:42 AMstrong-evening-37474
04/28/2021, 8:53 AMbroad-egg-29227
04/28/2021, 7:03 PMrefined-football-20364
04/29/2021, 4:32 AMkind-france-68039
04/29/2021, 9:46 AMcareful-pencil-58247
04/29/2021, 10:17 AMwonderful-dusk-20983
04/29/2021, 12:59 PMfaint-energy-11966
04/29/2021, 5:50 PMdelightful-florist-55380
04/30/2021, 4:00 AMgray-scientist-12794
04/30/2021, 7:49 AMkind-france-68039
04/30/2021, 4:03 PM