So what I meant was.... 3. I created a redirect (to make a short link) in the current .htaccess file and uploaded the edited file to the website.
On Monday, March 28, 2022 at 4:04:56 PM UTC-4 H.H. Brimley wrote: > Hi, I'm new to subversion & trying to figure out how to resolve this > conflict. > > 1. our web tech guy (who is currently on vacation) at some point versioned > the .htaccess file at the root of our site > 2. I had to make changes to the .htaccess file last week, and noticed it > was versioned, which it never had been before. I decided this was an error. > And I unversioned it, which apparently deleted it from my working copy in > the office. > 3. I created a redirect (to make a short link) in the current .htaccess > file and committed my changes. > 4. This weekend, I was asked to make an edit to the link I'd made. I was > at home, so I opened my work laptop and ran TSVN update on my working copy. > TSVN announced that there was a tree conflict with the .htaccess file. > > I reviewed the documentation on tree conflicts, but I'm still not > understanding how to resolve this. > > If I examine the .htaccess file (I'm at the office now) with the > repo-browser, and revert the specific version where I unversioned the > .htaccess file (and didn't do anything else) would that fix the conflict? > And then I could just create the correct redirect and commit my changes? Or > what steps should I take? > > Thanks! > Nik > > -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/da336057-2ed5-487f-9a4c-360087955652n%40googlegroups.com.
