[DiscordArchive] maybe you only added the remote but did not merge the branch into your own yet?
[DiscordArchive] maybe you only added the remote but did not merge the branch into your own yet?
Original source
maybe you only added the remote but did not merge the branch into your own yet?
rektbyfaith
09-19-2021, 02:20 PM #1Archived author: <o> • Posted: 2021-09-19T14:20:48.593000+00:00
Original source
maybe you only added the remote but did not merge the branch into your own yet?
Original source
try a `git merge gomove_3.3.5` in your current branch and see if that does anything
rektbyfaith
09-19-2021, 02:21 PM #2Archived author: <o> • Posted: 2021-09-19T14:21:46.688000+00:00
Original source
try a `git merge gomove_3.3.5` in your current branch and see if that does anything
Original source
(or `git pull gomove_3.3.5` if you forgot that step before)
rektbyfaith
09-19-2021, 02:22 PM #3Archived author: <o> • Posted: 2021-09-19T14:22:07.618000+00:00
Original source
(or `git pull gomove_3.3.5` if you forgot that step before)
Original source
![[Image: unknown.png?ex=690c06ee&is=690ab56e&hm=8...482c083d4&]](https://cdn.discordapp.com/attachments/870722120458600528/889155060498575360/unknown.png?ex=690c06ee&is=690ab56e&hm=860dcec0386921e29b5ddd253aa97b9d6d202331bcf005f55b96c34482c083d4&)
rektbyfaith
09-19-2021, 02:24 PM #4Archived author: Sanctuary • Posted: 2021-09-19T14:24:46.580000+00:00
Original source
Original source
this is what im getting
rektbyfaith
09-19-2021, 02:24 PM #5Archived author: Sanctuary • Posted: 2021-09-19T14:24:52.904000+00:00
Original source
this is what im getting
Original source
sorry, `git pull rochet2 gomove_3.3.5`
rektbyfaith
09-19-2021, 02:25 PM #6Archived author: <o> • Posted: 2021-09-19T14:25:43.732000+00:00
Original source
sorry, `git pull rochet2 gomove_3.3.5`
Original source
thats the last one i did, got the local changes would be overwritten
rektbyfaith
09-19-2021, 02:26 PM #7Archived author: Sanctuary • Posted: 2021-09-19T14:26:34.109000+00:00
Original source
thats the last one i did, got the local changes would be overwritten
Original source
![[Image: unknown.png?ex=690c0790&is=690ab610&hm=b...423fa2a01&]](https://cdn.discordapp.com/attachments/870722120458600528/889155741842280478/unknown.png?ex=690c0790&is=690ab610&hm=bb3f7cd494784b430cb8eb8f67f79346bc4b632b1e18184e1431da3423fa2a01&)
rektbyfaith
09-19-2021, 02:27 PM #8Archived author: Sanctuary • Posted: 2021-09-19T14:27:29.135000+00:00
Original source
Original source
you'll need to commit your current staged changes first (`git commit -m "whatever you did to the TransmogDisplayVendor file"`)
rektbyfaith
09-19-2021, 02:27 PM #9Archived author: <o> • Posted: 2021-09-19T14:27:50.621000+00:00
Original source
you'll need to commit your current staged changes first (`git commit -m "whatever you did to the TransmogDisplayVendor file"`)
1 Guest(s)
1 Guest(s)