On 2018-11-01 21:07, Scott Kostyshak wrote:
On Thu, Nov 01, 2018 at 05:18:18PM +0100, Daniel wrote:
On 01/11/2018 16:58, Scott Kostyshak wrote:
On Thu, Nov 01, 2018 at 06:52:11AM +0100, Daniel wrote:
Great. And by the way, while I tend to think all the changes I make sense, I
can change things on feedback.
Sounds good. One comment which I'm not sure is relevant is: often Qt
Creator reformats a bunch of things when you save. I find it helpful if
you just save a version that only contains the reformatting. This is the
analog of in LyX, when opening a 2.2.x document in LyX 2.3.x, save a
no-op (e.g. make a change, then save, then undo the change, then save).
Then, commit that. Then commit your changes in a separate commit. This
will make it easier to see exactly what you changed. I don't suggest you
go back and redo things, but I would prefer this for future changes (you
might want to check with others though; perhaps this is just my personal
preference).
I am not sure I can follow. Is the idea to make two commits? One with the
changes and one with the changes undone?
The idea is to make two commits: one with possibly changes to style, and
one with actual content change. It might be that the first commit is
unnecessary. To see, do the following: open a .ui file, make a change,
save, undo the change, save. If there is no diff, then this commit is
unnecessary. If there is a diff, then commit that. Sometimes newer Qt
Creator versions just add whitespace somewhere or have a different
style.
The analog is like opening a 2.2.x file in LyX 2.3.x. It makes sense to
commit just the lyx2lyx changes before committing changes to actual
content. Otherwise, it's not clear what changes are just the different
format and which changes are to the content.
Thanks, got it.
Another thing I realized is that when moving elements and back again to
try things out in Creator this sometimes still causes changes. So, it
might be better to undo changes using the undo function rather than
"manually" undoing.
Daniel
