0

Say I have made multiple changes to a file, but I only wish to commit a few of those changes back to trunk, i.e. lines 10-20 need committing but nothing else, is there a way to do this in SVN? Ideally using Tortoise SVN.

I'm not working on a branch, just on a checkout from trunk. I'm just committing a few obvious fixes nothing development related, mostly odd bits in makefiles.

Kara
  • 6,115
  • 16
  • 50
  • 57
chrisvarnz
  • 439
  • 7
  • 17

1 Answers1

0

Maybe commit changes you want to merge in separate commit, and then merge only this commit? I think it may be related post

Community
  • 1
  • 1
yakxxx
  • 2,841
  • 2
  • 21
  • 22
  • I did spot that one, but that question regards merging specific COMMITS in a branch, mine regards checking in specific changes in file(s) in a checkout. I thought there might be some sort of interactive merge where I can essentially generate a patch interactively, but it's not obvious. – chrisvarnz Aug 15 '12 at 13:06