C#•2y ago

Moving to GIT

Hey guys, we are about to move from TVS to GIT so I' doing some experiments and also trying to understand how it works and I have an issue. I selected "Limit merge types" option in Azure to make pull requests required if I want to push something to the main branch. Now I'm about to create pull req, but "Create" btn is disabled no matter what I'm doing and I'm not able to get more specific message about what's wrong. Any idea how to solve that ? Thank you

dance?•3/18/24, 12:21 PM

(what's tvs?)

CryyOP•3/18/24, 12:22 PM

*TFS, sorry

CCryy Hey guys, we are about to move from TVS to GIT so I' doing some experiments and ...

XE SparkyCracked•3/18/24, 1:16 PM

Did you manage?

CryyOP•3/18/24, 1:17 PM

Yeah I'm a bit stupid. Issue is ... if I understand it correctly if I want to create pull req I have to be in another/feature branch

CCryy Yeah I'm a bit stupid. Issue is ... if I understand it correctly if I want to cr...

XE SparkyCracked•3/18/24, 1:18 PM

yes haha. You need to be on a different branch, but you not stupid...just learning

XE SparkyCracked•3/18/24, 1:19 PM

also you must make sure there are changes to merge otherwise no point in pr

CryyOP•3/18/24, 1:21 PM

That's confused me cause I saw no changes in my pull request but there were definitely some commited waiting to be pushed so ... git's not so straightforward

CCryy That's confused me cause I saw no changes in my pull request but there were defi...

XE SparkyCracked•3/18/24, 1:21 PM

Yeah, I have created a document for git for work

XE SparkyCracked•3/18/24, 1:22 PM

I suggest doing something similar, if I send you it, it will be very overwhelming as it has everything

XE SparkyCracked•3/18/24, 1:23 PM

Maybe have the basics first and build on that. To start you off here is something small:

message.txt3.4KB

XE SparkyCracked•3/18/24, 1:25 PM

It is more bashed focused and may not include GUI interface instructions, feel free to use it as guidance or just ignore it. If you need help with something specific just ping me or something <3 @Cryy

XE SparkyCracked•3/18/24, 1:30 PM

Git_Workflow_Readme.pdf36.35KB

CryyOP•3/18/24, 1:30 PM

Ah great, thanks, really appreciate your help

CCryy Ah great, thanks, really appreciate your help 🙂

XE SparkyCracked•3/18/24, 1:30 PM

No stress. I sent the pdf version so it is easier to read

XE SparkyCracked•3/18/24, 1:31 PM

Hope it helps!

CryyOP•3/18/24, 1:40 PM

Definitely. I went through it and it's pretty easy to understand

CCryy That's confused me cause I saw no changes in my pull request but there were defi...

Jimmacle•3/18/24, 2:12 PM

if you don't push your local commits then they won't be on your remote repo to create a pull request for

Jimmacle•3/18/24, 2:12 PM

syncing between local and remote isn't automatic

CryyOP•3/18/24, 5:42 PM

@jIMMACLE @SparkyCracked Yeah, I figure that out too, thanks guys

One more question. In TFS we used reviews for some commits/check-ins and I think pull request has similar purpose. But if there are some changes I want author to fix or I'm not even able to build the changes (I set up some branch policies) how can I (as reviewer) to force author to fix that ? What is the standard flow for that in Azure ?

CCryy @jIMMACLE @SparkyCracked Yeah, I figure that out too, thanks guys 🙂 One more qu...

XE SparkyCracked•3/19/24, 8:01 AM

Sorry to respond so late, only on now (10am for me haha)
So how my company does it, is we have our manager as a required reviewer...on Azure it won't let you merge changes unless that Required Reviewer has accepted. So you just don't accept until it's done. Commenting on a PR will also prevent you from completing the merge until that comment is solved.

If you want to do the changes yourself you can. But wouldn't recommend working on their branch. So rather just comment and ensure you are a required reviewer. Hopefully that helps

CryyOP•3/19/24, 9:34 AM

Thank you

And one more q ... Is it possible to manage pull requests from VS 2022 ? From what I found that possibility is missing in VS 2022 and plugins are supported only in VS 2019.

CCryy Thank you 🙂 And one more q ... Is it possible to manage pull requests from VS 2...

XE SparkyCracked•3/19/24, 11:48 AM

We personally use Azure's website for that. I'm sure there is a way but I am not fimiliar with it sorry

CryyOP•3/19/24, 11:49 AM

It's ok but it really looks like there is no way in VS 2022. But maybe I'll try do more research

CCryy It's ok but it really looks like there is no way in VS 2022. But maybe I'll try ...

XE SparkyCracked•3/19/24, 11:51 AM

Cool. Lemme know if you find anything, would love to implememnt it as well on my side

CryyOP•3/20/24, 7:07 AM

@SparkyCracked well it looks like there is really no way to work with PR in VS 2022 (except for creating one). There are some plugins for VS2019 but it seems they does not work with DevOps :/

CryyOP•3/20/24, 7:08 AM

@SparkyCracked Is that weird that I dont understand the graph/branch that git use to display hisotry ? It seems really messy to me and also it looks a bit different in VS and for example in Source Tree

dance?•3/20/24, 7:16 AM

one of the feature that many visual git clients try to implement is showing the branch tree in an understandable way

CCryy @SparkyCracked Is that weird that I dont understand the graph/branch that git us...

XE SparkyCracked•3/20/24, 7:18 AM

No not wierd at all, I find it so messy as well don't stress. I think if your tree and branch management is good, it will look good

XE SparkyCracked•3/20/24, 7:18 AM

This was our branch at work before: